From 142368f0954e01f60aadb4ba620488fe83ccb68a Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Thu, 16 Oct 2014 12:58:43 +0200 Subject: [PATCH] X11: Fix crash in gdk_x11_gl_context_texture_from_surface We need to look at the impl_window for the gl rendering, not the subwindow we're rendering into. --- gdk/x11/gdkglcontext-x11.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gdk/x11/gdkglcontext-x11.c b/gdk/x11/gdkglcontext-x11.c index 1464d9aa95..3377f6966e 100644 --- a/gdk/x11/gdkglcontext-x11.c +++ b/gdk/x11/gdkglcontext-x11.c @@ -368,7 +368,7 @@ gdk_x11_gl_context_texture_from_surface (GdkGLContext *context, if (glx_pixmap == NULL) return FALSE; - window = gdk_gl_context_get_window (gdk_gl_context_get_current ()); + window = gdk_gl_context_get_window (gdk_gl_context_get_current ())->impl_window; window_scale = gdk_window_get_scale_factor (window); window_height = gdk_window_get_height (window); -- 2.30.2